Merge from trunk; up to r111011.
authorBill Wohler <wohler@newt.com>
Sun, 25 Nov 2012 19:32:40 +0000 (11:32 -0800)
committerBill Wohler <wohler@newt.com>
Sun, 25 Nov 2012 19:32:40 +0000 (11:32 -0800)
commit9c8867c4a835e82d40fe664f4dc108f17ef2aa5d
tree64ac263914995673552afed305ec5136f5d81a17
parentbf8ba8724a0d0ea3fdd898016f64bdf1a5cf3778
parent6844cf0b08211c87c5892fa3d605e2b182b5e755
Merge from trunk; up to r111011.